Revert "Revert 54064 and 53396" #54263
+816
−329
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.